bitkeeper revision 1.1159.1.197 (415d7115-5qi0fn3DgrhaAt6mCUClQ)

Run timer interrupt code when we catch up on lost interrupts.

diff --git a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/time.c b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/time.c
index edcc18dfd981e789d6efe5f7dd8a3958841d1aa0..935e7c3698f061ab3fa15fcc61d9dcd182cb3721 100644 (file)
--- a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/time.c
+++ b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/time.c
@@ -364,7 +364,6 @@ static inline void do_timer_interrupt(int irq, void *dev_id,
                                        struct pt_regs *regs)
 {
        s64 delta;
-       unsigned int ticks = 0;
        long sec_diff;
 
        __get_time_values_from_xen();
@@ -379,14 +378,9 @@ static inline void do_timer_interrupt(int irq, void *dev_id,
 
        /* Process elapsed jiffies since last call. */
        while (delta >= NS_PER_TICK) {
-               ticks++;
                delta -= NS_PER_TICK;
                processed_system_time += NS_PER_TICK;
-       }
-
-       if (ticks != 0) {
-               jiffies_64 += ticks - 1;
-               do_timer_interrupt_hook(regs); /* implicit 'jiffies_64++' */
+               do_timer_interrupt_hook(regs);
        }
 
        /*